From: Jonathan Dieter <jdieter@gmail.com>
Date: Wed, 25 Jul 2018 15:27:47 +0000 (+0100)
Subject: Fix zckdl
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~176
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5886e4b7ef3f130d3c808f2f2a0bb11129173b45;p=zchunk.git

Fix zckdl

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/src/lib/dl/dl.c b/src/lib/dl/dl.c
index 66f708c..a82adb4 100644
--- a/src/lib/dl/dl.c
+++ b/src/lib/dl/dl.c
@@ -120,7 +120,7 @@ static int write_and_verify_chunk(zckCtx *src, zckCtx *tgt,
                                   zckChunk *src_idx,
                                   zckChunk *tgt_idx) {
     VALIDATE_READ_BOOL(src);
-    VALIDATE_WRITE_BOOL(tgt);
+    VALIDATE_READ_BOOL(tgt);
 
     static char buf[BUF_SIZE] = {0};
 
diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c
index 027a1ac..bd0fc61 100644
--- a/src/lib/dl/range.c
+++ b/src/lib/dl/range.c
@@ -57,8 +57,8 @@ static zckRangeItem *range_insert_new(zckCtx *zck, zckRangeItem *prev,
         next->prev = new;
     }
     if(add_index)
-        if(!index_new_chunk(&(info->index), idx->digest, idx->digest_size,
-                                end-start+1, end-start+1, False, NULL)) {
+        if(!index_new_chunk(zck, &(info->index), idx->digest, idx->digest_size,
+                                end-start+1, end-start+1, False)) {
             free(new);
             return NULL;
         }
diff --git a/src/lib/index/index_create.c b/src/lib/index/index_create.c
index 3923b01..6b4af93 100644
--- a/src/lib/index/index_create.c
+++ b/src/lib/index/index_create.c
@@ -133,9 +133,8 @@ int index_create(zckCtx *zck) {
     return True;
 }
 
-int index_new_chunk(zckIndex *index, char *digest, int digest_size,
-                    size_t comp_size, size_t orig_size, int finished,
-                    zckCtx *zck) {
+int index_new_chunk(zckCtx *zck, zckIndex *index, char *digest, int digest_size,
+                    size_t comp_size, size_t orig_size, int finished) {
     VALIDATE_BOOL(zck);
 
     if(index == NULL) {
diff --git a/src/lib/io.c b/src/lib/io.c
index 651521e..0ae1692 100644
--- a/src/lib/io.c
+++ b/src/lib/io.c
@@ -51,7 +51,7 @@ ssize_t read_data(zckCtx *zck, char *data, size_t length) {
 }
 
 int write_data(zckCtx *zck, int fd, const char *data, size_t length) {
-    VALIDATE_WRITE_INT(zck);
+    VALIDATE_INT(zck);
 
     if(length == 0)
         return True;
diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h
index 4ce806d..25cc8c3 100644
--- a/src/lib/zck_private.h
+++ b/src/lib/zck_private.h
@@ -324,9 +324,8 @@ int index_read(zckCtx *zck, char *data, size_t size, size_t max_length)
     __attribute__ ((warn_unused_result));
 int index_create(zckCtx *zck)
     __attribute__ ((warn_unused_result));
-int index_new_chunk(zckIndex *index, char *digest, int digest_size,
-                    size_t comp_size, size_t orig_size, int valid,
-                    zckCtx *zck)
+int index_new_chunk(zckCtx *zck, zckIndex *index, char *digest, int digest_size,
+                    size_t comp_size, size_t orig_size, int valid)
     __attribute__ ((warn_unused_result));
 int index_add_to_chunk(zckCtx *zck, char *data, size_t comp_size,
                         size_t orig_size)